Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 23:43:15 +0000 (23:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 23:43:15 +0000 (23:43 +0000)
commitd45510dbf36e85dc22f8cc514a1ca70bbf3d2af7
tree46b3c77969748b006e38514ea0ed70d55c5cc1c6
parentcfeed7fa388c4f5896af75f154bdfbf756101744
parentf25ff0ddddf5f2e89720d6770070ee53ce4773b5
Merge from mainline.